Merge pull request #1854 from kurund/CRM-13327