Merged with Blockly proper:
Synchronised to commit 49fa610f0ba0c4038d4a9c1ad5b3d8db0c4a7d23 (https://github.com/google/blockly/commit/49fa610f0ba0c4038d4a9c1ad5b3d8db0c4a7d23)