Merge pull request #6837 from eileenmcnaughton/CRM-17176