Merge pull request #6602 from colemanw/CRM-16990