Merge branch 'master' into plugin-blockmap-patches-intellij
authorIvan Petrov <Ivan.Petrov@jetbrains.com>
Fri, 21 Aug 2020 09:00:31 +0000 (12:00 +0300)
committerintellij-monorepo-bot <intellij-monorepo-bot-no-reply@jetbrains.com>
Fri, 21 Aug 2020 09:00:31 +0000 (09:00 +0000)
GitOrigin-RevId: 07b7593f44bb3911eb70460f522166b872734024


Trivial merge