CRM-13215
Merge pull request #1415 from yashodha/CRM-13215

CRM-13215