Merge remote-tracking branch 'origin/master' into bkchr-fix-warnings-etc