Merge pull request #6475 from colemanw/CRM-16806