Add changed from Blockly r1682
Add changes from Blockly to rev r1685