Merge remote-tracking branch 'origin/master'
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Mon, 29 Feb 2016 18:56:39 +0000 (19:56 +0100)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Mon, 29 Feb 2016 18:56:39 +0000 (19:56 +0100)

Trivial merge