Merge pull request #4 from dlobo/CRM-12163

CRM-12163
CRM-12163