Merge pull request #3295 from NeoRaider/sudo