Merge pull request #904 from Kinematics/4.1-dev

GearSwap - Fix function signature for weather event handler.
GearSwap - Fix function signature for zone change event handler.