Merge pull request #3536 from davilla/joystick