Merge remote-tracking branch 'origin/master'
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Thu, 30 Jan 2014 14:45:03 +0000 (15:45 +0100)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Thu, 30 Jan 2014 14:45:03 +0000 (15:45 +0100)

Trivial merge