Merge branch 'fix/py-debug-process-timeout' of https://github.com/da1z/intellij-community
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 25 Apr 2017 18:54:52 +0000 (20:54 +0200)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 25 Apr 2017 18:54:52 +0000 (20:54 +0200)

Trivial merge