use asynch version of close on disconnect
Merge remote-tracking branch 'upstream/master'
new upstream release