Merge remote-tracking branch 'origin/master'
authorKonstantin Bulenkov <kb@jetbrains.com>
Thu, 15 Sep 2016 16:36:41 +0000 (18:36 +0200)
committerKonstantin Bulenkov <kb@jetbrains.com>
Thu, 15 Sep 2016 16:36:41 +0000 (18:36 +0200)

Trivial merge