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