Merge change 2941

* changes:
  make FEATURE_OPENGL public (but hidden for now) so we can test with it