Merge "Use GLES 3.0 by default" into devel/master