makes admins not required
Merge remote-tracking branch 'upstream/master'