Merge pull request #6300 from colemanw/CRM-16860