cut of the end of long usernames
Merge remote-tracking branch 'origin/master' into stable