Merge remote-tracking branch 'origin/pycharm/docker' into pycharm/docker
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 29 Sep 2015 19:24:29 +0000 (21:24 +0200)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 29 Sep 2015 19:24:29 +0000 (21:24 +0200)

Trivial merge