CRM-12123
Merge pull request #5 from dlobo/CRM-12123

CRM-12123