CRM-13278
Merge pull request #1509 from yashodha/CRM-13278

CRM-13278