Merge pull request #1575 from seanpaultaylor/next

Next
Merge pull request #1576 from seanpaultaylor/next

Fixed #1564
Fixed #1577. Incorrect bitshift from Android gamepad support