Merge branch 'master' of git://github.com/asedunov/intellij-community into pull101