Merge last two commits into renderergl2