Merge remote-tracking branch 'origin/master'
authorKonstantin Bulenkov <kb@jetbrains.com>
Tue, 19 Apr 2016 22:00:29 +0000 (00:00 +0200)
committerKonstantin Bulenkov <kb@jetbrains.com>
Tue, 19 Apr 2016 22:00:29 +0000 (00:00 +0200)

Trivial merge