Merge branch 'master' into pretty-user-display