Merge https://github.com/jk1/intellij-community