Merge remote-tracking branch 'origin/master'
authorKonstantin Bulenkov <kb@jetbrains.com>
Mon, 10 Aug 2015 14:06:35 +0000 (16:06 +0200)
committerKonstantin Bulenkov <kb@jetbrains.com>
Mon, 10 Aug 2015 14:06:35 +0000 (16:06 +0200)

Trivial merge