Merge pull request #3529 from eileenmcnaughton/CRM-14887