Merge remote-tracking branch 'origin/master'
authorKonstantin Bulenkov <kb@jetbrains.com>
Thu, 6 Oct 2016 15:37:55 +0000 (17:37 +0200)
committerKonstantin Bulenkov <kb@jetbrains.com>
Thu, 6 Oct 2016 15:37:55 +0000 (17:37 +0200)

Trivial merge