merge haptic and joystick fixes
authorTaylor Richards <taylor@icculus.org>
Sun, 15 Oct 2017 04:15:13 +0000 (00:15 -0400)
committerTaylor Richards <taylor@icculus.org>
Sun, 15 Oct 2017 04:15:13 +0000 (00:15 -0400)

Trivial merge