Merge remote-tracking branch 'origin/master'
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Thu, 20 Oct 2016 20:02:34 +0000 (22:02 +0200)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Thu, 20 Oct 2016 20:02:34 +0000 (22:02 +0200)

Trivial merge