Merge pull request #7647 from colemanw/CRM-17645