Merged master in to Messages
Messages changes
Merge commits
Message styling progress
Merge branch 'master' into messages
Merge commit