Merge remote-tracking branch 'origin/master'
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Fri, 29 Jun 2018 17:48:47 +0000 (19:48 +0200)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Fri, 29 Jun 2018 17:48:47 +0000 (19:48 +0200)

Trivial merge