84ecebb922
Merge commit 'e25e03612e1a2988ed83f24d2658cf0898fd1944' * commit 'e25e03612e1a2988ed83f24d2658cf0898fd1944': We accidentally always aborted after 10 secs, even if the connection was fine.