CRM-12734
Merge pull request #928 from yashodha/4.3

CRM-12734