CRM-12291

This made sense to me as a way to do a pull request. I did it all on my local master branch.  Maybe I should have made a new branch but it didnt't seem necessary. Let me know if I did thing wrong :)