Merge pull request #5880 from eileenmcnaughton/CRM-16536