Merge branch 'master' into kill-deprecation-warnings