fix CRM-12088
Merge pull request #115 from dlobo/CRM-12088

fix CRM-12088