CRM-12451
Merge pull request #1213 from yashodha/4.3.CRM-12451

CRM-12451