Merge pull request #3837 from eileenmcnaughton/CRM-15113