Incorporate 99d584d from blockly-core