Merge branch 'js/4423' into dev
Authored by: Tim Van Steenburgh 2012-07-10
Parent(s): [392e90][7ffa92]
Child(ren): [7f890d]