Merge pull request #2372 from kurund/CRM-13981