sync gorillascript.js to upstream latest