Fix Dojo for compressed mode.
Merge branch 'master' into develop