Merge pull request #6386 from eileenmcnaughton/CRM-16955