Merge branch 'js/2549' into dev
Authored by: Wayne Witzel III 2011-10-07
Parent(s): [3ac30a][5328a5]
Child(ren): [2b3ae2]