Fix race condition that could kill connections before they
were initiated
Merge remote-tracking branch 'upstream/master'