CRM-12219
Merge pull request #307 from yashodha/CRM-12219

CRM-12219