Merge pull request #784 from ravishnair/CRM-10397