Better error reporting in case of ssh terminal connection problems (IDEA-118869).
Merge remote-tracking branch 'origin/master'