Merge "We accidentally always aborted after 10 secs, even if the connection was fine." into gingerbread