CRM-12374
Merge pull request #470 from yashodha/CRM-12374

CRM-12374