CRM-12205
Merge pull request #240 from dlobo/CRM-12205

CRM-12205