Merge remote-tracking branch 'origin/pycharm/gae-console'
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 13 Oct 2015 16:49:32 +0000 (18:49 +0200)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 13 Oct 2015 16:49:32 +0000 (18:49 +0200)

Trivial merge