Fixed uses of dojo global.
Merge branch 'develop' into topic-dojo-upgrade