Merge remote-tracking branch 'origin/master'
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Fri, 28 Feb 2014 15:51:57 +0000 (16:51 +0100)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Fri, 28 Feb 2014 15:51:57 +0000 (16:51 +0100)

Trivial merge