Merge remote-tracking branch 'origin/master'
authorKonstantin Bulenkov <kb@jetbrains.com>
Thu, 11 Aug 2016 19:55:00 +0000 (21:55 +0200)
committerKonstantin Bulenkov <kb@jetbrains.com>
Thu, 11 Aug 2016 19:55:00 +0000 (21:55 +0200)

Trivial merge