CRM-12195
Merge pull request #235 from dlobo/CRM-12195

CRM-12195