Merge remote-tracking branch 'origin/master'
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Wed, 26 Oct 2016 16:31:15 +0000 (18:31 +0200)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Wed, 26 Oct 2016 16:31:15 +0000 (18:31 +0200)

Trivial merge