CRM-12689
Merge pull request #997 from yashodha/crm-12689.4.4

CRM-12689