Merge pull request #3912 from eileenmcnaughton/CRM-15168