Merge pull request #7892 from eileenmcnaughton/CRM-18125