Adjusted optimize by size offset for XFree86.
Merge origin/master
Merge origin/master
Refactored input helper test to try and improve clarity.
Fixed a few small issues in the windows input helper.