CRM-13404
Merge pull request #1656 from yashodha/CRM-13404

CRM-13404