Merge remote-tracking branch 'origin/master'
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 30 Sep 2014 12:28:34 +0000 (14:28 +0200)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 30 Sep 2014 12:28:34 +0000 (14:28 +0200)

Trivial merge