Merge remote-tracking branch 'origin/master'
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Wed, 22 Jan 2014 20:02:12 +0000 (21:02 +0100)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Wed, 22 Jan 2014 20:02:12 +0000 (21:02 +0100)

Trivial merge