sort users and group updates traces (#132)
Merge remote-tracking branch 'upstream/master'

second merge
.gitignore not OK