CRM-12254
CRM-12254
Merge pull request #286 from dlobo/CRM-12254

CRM-12254