Merge pull request #2365 from eileenmcnaughton/CRM-14080