Merge pull request #6290 from eileenmcnaughton/CRM-16809