fixed HTTP 500 on the Create/Edit User page
Merge remote-tracking branch 'origin/Develop' into Develop