Merge pull request #431 from ravishnair/CRM-12348