Merge branch 'hotfix-2.1.30'
Fix to users with auth key access not being able to reset their authkey
Merge branch 'hotfix-2.1.31' into develop