Merge pull request #838 from colemanw/CRM-10573