Add user switching/dropping privileges option
Merge remote-tracking branch 'origin/master'