Merge branch 'master' into bug312752