Merge pull request #691 from seanpaultaylor/next

Minor fixes to Gamepad and LightTest.
Fixed CMake builds on Linux