Merge remote-tracking branch 'origin/master'
authorKonstantin Bulenkov <kb@jetbrains.com>
Tue, 30 May 2017 00:06:02 +0000 (02:06 +0200)
committerKonstantin Bulenkov <kb@jetbrains.com>
Tue, 30 May 2017 00:06:02 +0000 (02:06 +0200)

Trivial merge