Merge "Fixed SVACE error in gles-context.cpp" into devel/master