Merge remote-tracking branch 'origin/master'
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Sun, 30 Oct 2016 17:36:00 +0000 (18:36 +0100)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Sun, 30 Oct 2016 17:36:00 +0000 (18:36 +0100)

Trivial merge