CRM-12164
Merge pull request #8 from dlobo/CRM-12164

CRM-12164