CRM-12274
Merge pull request #489 from yashodha/CRM-12274

CRM-12274