doing some more testing...it's been a while since I used git
Merge branch 'master' into Messaging