CRM-13105
Merge pull request #1235 from yashodha/4.3.CRM-13105

CRM-13105