Add a script to update users
Merge remote-tracking branch 'upstream/master'