Merge pull request #1 from JetBrains/master

Merge the latest JetBrains changes into TiVo