Merge pull request #961 from Windower/4.1-dev

GearSwap and Slips fixes
Merge branch '4.1-dev' into 4.1
GearSwap: Fix the fixes
GearSwap - manual merge
Merge pull request #963 from Windower/4.1-dev

GearSwap - subjob change fix
Cherry-pick stupidity fix
Merge branch '4.1' of https://github.com/Windower/Lua into 4.1
Libs/Files: Minor adjustments
Merge pull request #966 from Windower/4.1

Live > Dev merge