Merge pull request #7133 from eileenmcnaughton/CRM-17509