Fixes to sceneless renderpath on OpenGL.
Merge remote-tracking branch 'upstream/master'