Merge pull request #1059 from pratik-joshi/CRM-12942