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

Trivial merge