Merge pull request #2540 from eileenmcnaughton/CRM-14235