Merge remote-tracking branch 'origin/master'
authorKonstantin Bulenkov <kb@jetbrains.com>
Fri, 12 Aug 2016 12:56:51 +0000 (14:56 +0200)
committerKonstantin Bulenkov <kb@jetbrains.com>
Fri, 12 Aug 2016 12:56:51 +0000 (14:56 +0200)

Trivial merge