Merge pull request #2401 from eileenmcnaughton/CRM-14120