Merge branch 'dev' into tv/4142
Authored by: Tim Van Steenburgh 2012-06-27
Parent(s): [8e0fac][d13b9c]
Child(ren): [029847]