Some changes to hopefully fix some problems with repeated users.
Merge remote-tracking branch 'origin/master'