Merge pull request #457 from yashodha/CRM-12365