Merge branch 'js/2818' into dev
Authored by: Tim Van Steenburgh 2012-04-18
Parent(s): [8169f3][e28894]
Child(ren): [6f8e88]