Merge branch 'master' into user-display-name+settings