CRM-12151
Merge pull request #196 from dlobo/CRM-12151

CRM-12151