Bring in fixes for subusers.
Merge branch 'master' of https://github.com/felina/server