Merge  from JetBrains/master

Merge the latest JetBrains changes into TiVo