CRM-12357
Merge pull request #495 from yashodha/CRM-12357

CRM-12357