updated joysticks
Merge origin/master