CRM-12583
Merge pull request #785 from yashodha/4.3

CRM-12583