fix for http://trac.dojotoolkit.org/ticket/17018
Merge remote-tracking branch 'upstream/master'
Merge pull request #195 from cjolif/master

Fix trac ticket 17018