Merge pull request #688 from colemanw/CRM-12471