Merge pull request #3883 from eileenmcnaughton/CRM-14398