Disallowing user listing for non-administrators
Updated code to fit with organizations
Merge pull request #231 from dswd/disallow_user_listing

Disallowing user listing for non-administrators
Merged with upstream