Merge branch 'master' into r300g-glsl