Merge pull request #7649 from eileenmcnaughton/CRM-17350