GearSwap - Fix: combine with base set.
Merge pull request #920 from Kinematics/4.1-dev

GearSwap - Fix: combine with base set.