am 0cbc4a6c: (-s ours) am 9e8e40cb: Recognize 3D joysticks.  (DO NOT MERGE)

* commit '0cbc4a6c3ce795497ac136736dacf5eeb0ffa6ac':
  Recognize 3D joysticks.  (DO NOT MERGE)