Merge remote-tracking branch 'origin/master'
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Sun, 9 Feb 2014 19:44:01 +0000 (20:44 +0100)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Sun, 9 Feb 2014 19:44:01 +0000 (20:44 +0100)

Trivial merge