Merge remote-tracking branch 'origin/master'
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Wed, 9 Nov 2016 17:45:31 +0000 (18:45 +0100)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Wed, 9 Nov 2016 17:45:31 +0000 (18:45 +0100)

Trivial merge