Merge pull request #7546 from eileenmcnaughton/CRM-16259