Merge pull request #1335 from yashodha/CRM-12981