Merge remote-tracking branch 'origin/master'
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Mon, 20 Jan 2014 16:28:10 +0000 (17:28 +0100)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Mon, 20 Jan 2014 16:28:10 +0000 (17:28 +0100)

Trivial merge