CRM-12196
Merge pull request #236 from dlobo/CRM-12196

CRM-12196