CRM-12269
Merge pull request #316 from yashodha/CRM-12269

CRM-12269