Merge pull request #7396 from eileenmcnaughton/CRM-17627