Merge pull request #5146 from eileenmcnaughton/CRM-15955