Merge branch 'master' of git.labs.intellij.net:idea/community
authorVasily Romanikhin <vasily.romanikhin@jetbrains.com>
Thu, 11 Jan 2018 12:37:07 +0000 (15:37 +0300)
committerVasily Romanikhin <vasily.romanikhin@jetbrains.com>
Thu, 11 Jan 2018 12:37:07 +0000 (15:37 +0300)

Trivial merge