Merge remote-tracking branch 'origin/master'
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Fri, 11 Nov 2016 10:31:11 +0000 (11:31 +0100)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Fri, 11 Nov 2016 10:31:11 +0000 (11:31 +0100)

Trivial merge