Merge branch 'master' into r300-compiler