Merge remote-tracking branch 'origin/master'
authorKonstantin Bulenkov <kb@jetbrains.com>
Mon, 27 Jun 2016 12:08:41 +0000 (14:08 +0200)
committerKonstantin Bulenkov <kb@jetbrains.com>
Mon, 27 Jun 2016 12:08:41 +0000 (14:08 +0200)

Trivial merge