-- CRM-13658 fix
Merge pull request #1864 from ravishnair/CRM-13658

-- CRM-13658 fix