Merge pull request #5123 from eileenmcnaughton/CRM-15369