Merge pull request #6600 from colemanw/CRM-17038