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

Trivial merge