Merge change 6712

* changes:
  fix for [1969185] valgrind errors in new gl stuff