Merge branch 'master-fixes'