Backport Superuser from CM10.1

Original author: Adam Farden