Merge pull request #165 from colemanw/CRM-12122