Fix bad merge. Commit  36e0764e577397d451c2270861c3ecbff36891a6 and e39a0b70692f89c83493371f141e82010f7c6e7c collided on their use/removal of the event param to one of the zoom functions.
Fix bad merge. Commit  36e0764e577397d451c2270861c3ecbff36891a6 and e39a0b70692f89c83493371f141e82010f7c6e7c collided on their use/removal of the event param to one of the zoom functions.

InspectorWidget/blockly,marianoguerra/blockly,trodi/blockly,trodi/blockly,markocelan/blockly-minecraft,carlosperate/ardublockly,drigz/blockly,joshlory/blockly,carlosperate/ardublockly,marianoguerra/blockly,rachel-fenichel/blockly,ralic/blockly,aravart/speech-blocks,markocelan/blockly-minecraft,trinketapp/blockly,nickmain/blockly,cmillani/blockly,gengshenghong/scratch-blocks,TechplexEngineer/blockly,griffpatch/scratch-blocks,rachel-fenichel/blockly,gengshenghong/scratch-blocks,dhalupa/blockly,ralic/blockly,rachel-fenichel/blockly,jstnhuang/blockly,carloslfu/blockly,picklesrus/blockly,google/blockly,google/blockly,CocoMake7/CocoBlockly,twodee/blockly,mark-friedman/blockly,jstnhuang/blockly,sclements/scratch-blocks,trinketapp/blockly,carlosperate/blockly,OpenRoberta/blockly,twodee/blockly,CocoMake7/CocoBlockly,twodee/blockly,dhalupa/blockly,OpenRoberta/blockly,nickmain/blockly,LLK/scratch-blocks,gengshenghong/scratch-blocks,marianoguerra/blockly,CocoMake7/CocoBlockly,rachel-fenichel/blockly,drigz/blockly,groklearning/blockly,lzairdking/blockly,mark-friedman/blockly,nickmain/blockly,trodi/blockly,griffpatch/scratch-blocks,rachel-fenichel/blockly,google/blockly-devtools,gupta137/blockly,hkoi/blockly,carloslfu/blockly,google/blockly,trinketapp/blockly,markocelan/blockly-minecraft,InspectorWidget/blockly,carlosperate/blockly,RealTimeWeb/blockly,groklearning/blockly,sclements/scratch-blocks,nickmain/blockly,cmillani/blockly,carlosperate/ardublockly,lzairdking/blockly,daarond/blockly,nickmain/blockly,trinketapp/blockly,griffpatch/scratch-blocks,LLK/scratch-blocks,twodee/blockly,RealTimeWeb/blockly,gengshenghong/scratch-blocks,joshlory/blockly,griffpatch/scratch-blocks,rachel-fenichel/blockly,LLK/scratch-blocks,mark-friedman/blockly,LLK/scratch-blocks,carlosperate/blockly,joshlory/blockly,markocelan/blockly-minecraft,google/blockly,sclements/scratch-blocks,twodee/blockly,griffpatch/scratch-blocks,twodee/blockly,gupta137/blockly,google/blockly,carlosperate/blockly,drigz/blockly,mark-friedman/blockly,jstnhuang/blockly,sclements/scratch-blocks,gengshenghong/scratch-blocks,picklesrus/blockly,hkoi/blockly,rachel-fenichel/blockly,groklearning/blockly,jano42/blockly,mark-friedman/blockly,OpenRoberta/blockly,sclements/scratch-blocks,jstnhuang/blockly,dhalupa/blockly,jano42/blockly,carloslfu/blockly,mark-friedman/blockly,LLK/scratch-blocks,google/blockly,google/blockly,gupta137/blockly,OpenRoberta/blockly,nickmain/blockly,cmillani/blockly,TechplexEngineer/blockly,trodi/blockly,ralic/blockly,InspectorWidget/blockly,hkoi/blockly,groklearning/blockly,daarond/blockly,jano42/blockly,RealTimeWeb/blockly,picklesrus/blockly,daarond/blockly,lzairdking/blockly,google/blockly-devtools,lzairdking/blockly,aravart/speech-blocks,jano42/blockly