CRM-12223
Merge pull request #6 from dlobo/CRM-12223

CRM-12223