Merge remote-tracking branch 'origin/master'
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Thu, 19 Jan 2017 17:12:35 +0000 (18:12 +0100)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Thu, 19 Jan 2017 17:12:35 +0000 (18:12 +0100)

Trivial merge