Now with Other Users
Merge remote-tracking branch 'origin/master'
With Other users