CRM-12111
Merge pull request #140 from dlobo/CRM-12111

CRM-12111