Merge remote-tracking branch 'origin/master'
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 11 Feb 2014 17:56:49 +0000 (18:56 +0100)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 11 Feb 2014 17:56:49 +0000 (18:56 +0100)

Trivial merge