fixed bad merge
Merge pull request #2608 from kurund/CRM-14311

fixed bad merge