2eedb2515b
Merge commit '46e28db8818332e3cda4cc410cc89a1ed7ce4db6' * commit '46e28db8818332e3cda4cc410cc89a1ed7ce4db6': fix for [1969185] valgrind errors in new gl stuff