Merge pull request #6150 from eileenmcnaughton/CRM-16803