Merge branch 'js/1829' into dev
Authored by: Wayne Witzel III 2011-08-31
Parent(s): [010337][28e317]
Child(ren): [5d7db8]