-- fix for CRM-10993
Merge pull request #721 from ravishnair/CRM-10993

-- fix for CRM-10993