Merge branch 'master' of git.labs.intellij.net:idea/community into smartcompletion