CRM-12458
Merge pull request #690 from yashodha/4.3.CRM-12458

CRM-12458