Merge remote-tracking branch 'origin/master'
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Thu, 15 May 2014 22:04:05 +0000 (00:04 +0200)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Thu, 15 May 2014 22:04:05 +0000 (00:04 +0200)

Trivial merge