Merge pull request #2200 from colemanw/CRM-13497