Merge branch 'master' into various-fixes-and-enhancements