Patch 17400

Pathc 17400 : https://bugs.dojotoolkit.org/ticket/17400