Merge remote-tracking branch 'origin/master'
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 24 Feb 2015 17:05:46 +0000 (18:05 +0100)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 24 Feb 2015 17:05:46 +0000 (18:05 +0100)

Trivial merge