CRM-12183
Merge pull request #229 from dlobo/CRM-12183

CRM-12183