Merge remote-tracking branch 'origin/master'
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Thu, 29 Sep 2016 14:15:56 +0000 (16:15 +0200)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Thu, 29 Sep 2016 14:15:56 +0000 (16:15 +0200)

Trivial merge