Merge remote-tracking branch 'origin/master'
authorKonstantin Bulenkov <kb@jetbrains.com>
Tue, 18 Oct 2016 12:22:32 +0000 (14:22 +0200)
committerKonstantin Bulenkov <kb@jetbrains.com>
Tue, 18 Oct 2016 12:22:32 +0000 (14:22 +0200)

Trivial merge