correcting a bug preventing the execution with the dojo loader
Merge remote-tracking branch 'upstream/master'
really fix the bug with dojo