Nulling out the connection field when it's being closed.
Merged branch '2.9.x' into 'master'.