Merge remote-tracking branch 'origin/master'
authorStanislav Dombrovsky <stanislav.dombrovsky@jetbrains.com>
Fri, 26 Jan 2018 13:44:42 +0000 (16:44 +0300)
committerStanislav Dombrovsky <stanislav.dombrovsky@jetbrains.com>
Fri, 26 Jan 2018 13:44:42 +0000 (16:44 +0300)

Trivial merge