Merge remote branch 'origin/7.8' into 7.8-gles