Fixing unit test (merge?)
Closing connections when a resource is removed
Cosmetics
Merge pull request #923 from delving/13.06-graceful-connection-closing

13.06 graceful connection closing