Merge branch 'dev' into tv/4142
Authored by: Tim Van Steenburgh 2012-06-26
Parent(s): [9d8474][f581e6]
Child(ren): [c83311]