Fixed some issues with member edit showing too many fields to non member admins.
Merge branch 'master' into release