Merge branch 'master' into user-display-name+settings
Merge pull request #243 from kimardenmiller/user-display-name+settings

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