Merge remote-tracking branch 'origin/master'
authorKonstantin Bulenkov <kb@jetbrains.com>
Wed, 19 Oct 2016 12:26:02 +0000 (14:26 +0200)
committerKonstantin Bulenkov <kb@jetbrains.com>
Wed, 19 Oct 2016 12:26:02 +0000 (14:26 +0200)

Trivial merge