Merge remote-tracking branch 'glBitmap.delphigl.com/unstable'