Merge pull request #2472 from kurund/CRM-14167