Merge remote-tracking branch 'origin/master'
authorKonstantin Bulenkov <kb@jetbrains.com>
Sat, 13 Aug 2016 18:11:20 +0000 (20:11 +0200)
committerKonstantin Bulenkov <kb@jetbrains.com>
Sat, 13 Aug 2016 18:11:20 +0000 (20:11 +0200)

Trivial merge