Merge remote-tracking branch 'origin/master'
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Mon, 11 Aug 2014 17:38:57 +0000 (19:38 +0200)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Mon, 11 Aug 2014 17:38:57 +0000 (19:38 +0200)

Trivial merge