Merge pull request #4955 from kissg1988/sudo