CRM-12410
Merge pull request #526 from yashodha/CRM-12410

CRM-12410