Merge remote-tracking branch 'origin/master'
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 25 Feb 2014 13:06:35 +0000 (14:06 +0100)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 25 Feb 2014 13:06:35 +0000 (14:06 +0100)

Trivial merge