Merge branch 'master' into gcc_refactor