gamepad 'should' be now in place
Merge remote-tracking branch 'syd/master'