Merge pull request #889 from Kinematics/4.1-dev

GearSwap - Mote-libs - Simplify variable selection to use 'or' shortcuts
GearSwap: Mote-libs: Fix issues with case selection.