Merge branch 'sudoman-mods'