Merge pull request #2076 from colemanw/CRM-11864