Merge pull request #121 from colemanw/CRM-12099