Merge pull request #545 from ravishnair/CRM-9069