CRM-7564
Merge pull request #244 from yashodha/CRM-7564

CRM-7564