Merge pull request #220 from kurund/CRM-12155