CRM-12256
Merge pull request #290 from dlobo/CRM-12256

CRM-12256