Merge pull request #2320 from kurund/CRM-14052