Merge branch 'master' into pre-release