users.patch - sync with upstream
Merge pull request #606 from lslezak/users_sync

users.patch - sync with upstream