CRM-12426
Merge pull request #569 from yashodha/4.3

CRM-12426