Merge pull request #169 from kurund/CRM-12012