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

Trivial merge