Merge remote-tracking branch 'origin/master'
authorAlexey Utkin <alexey.utkin@jetbrains.com>
Wed, 9 Aug 2017 08:44:54 +0000 (11:44 +0300)
committerAlexey Utkin <alexey.utkin@jetbrains.com>
Wed, 9 Aug 2017 08:44:54 +0000 (11:44 +0300)

Trivial merge