Merge branch 'js/3698' into dev
Authored by: Tim Van Steenburgh 2012-04-25
Parent(s): [b9b25f][ce5116]
Child(ren): [a9ff63]