CRM-12117
Merge pull request #164 from dlobo/CRM-12117

CRM-12117