-- fix for CRM-9069
Merge pull request #545 from ravishnair/CRM-9069

-- fix for CRM-9069