Remove socket.end calls
Upgrade devdependencies
Merge branch 'master' into upgrade-tests
Load test tweaks