Merge change I56981989 into eclair

* changes:
  fix [2231527] Compatibility with SpaceJunk game (OpenGL)