Merge branch '42cc_4189_new_dev' into dev
Authored by: Tim Van Steenburgh 2012-08-14
Parent(s): [7a868b][89029e]
Child(ren): [4334ee]