Merge branch 'master' into upstream-fixes