Merge "fix openGL issue - cannot load the enviroment variable"