CRM-12121
Merge pull request #163 from dlobo/CRM-12121

CRM-12121