Merge remote-tracking branch 'origin/master'
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Mon, 14 Nov 2016 14:17:19 +0000 (15:17 +0100)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Mon, 14 Nov 2016 14:17:19 +0000 (15:17 +0100)

Trivial merge