CRM-12247
Merge pull request #283 from dlobo/CRM-12247

CRM-12247