Merge remote-tracking branch 'origin/master'
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Thu, 25 Feb 2016 19:40:03 +0000 (20:40 +0100)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Thu, 25 Feb 2016 19:40:03 +0000 (20:40 +0100)

Trivial merge