Update Users.  Clean up password field on record close when password changed.
Merge remote-tracking branch 'origin/develop' into develop