Merge remote-tracking branch 'origin/master'
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Mon, 20 Jan 2014 11:59:35 +0000 (12:59 +0100)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Mon, 20 Jan 2014 11:59:35 +0000 (12:59 +0100)

Trivial merge