Merge pull request #7282 from eileenmcnaughton/CRM-17454