CRM-12100
Merge pull request #127 from dlobo/CRM-12100

CRM-12100