Merge pull request #860 from yashodha/CRM-12688