Merge branch 'master' into sudoman-mods