CRM-12151
Merge pull request #200 from dlobo/CRM-12151

CRM-12151