Merge pull request #4819 from eileenmcnaughton/CRM-15680