Merge branch 'master' into glew and fixed a crash on Intel HD drivers