Merge remote-tracking branch 'origin/master'
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Thu, 10 Nov 2016 16:35:43 +0000 (17:35 +0100)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Thu, 10 Nov 2016 16:35:43 +0000 (17:35 +0100)

Trivial merge