Ensure no double-close of connections #9
Merge remote-tracking branch 'origin/master'