Merge in patch from https://code.google.com/p/blockly/issues/detail?id=231 for issue #231.