Merge change 6713 into donut

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