fix tests
Merge remote-tracking branch 'origin/master'

Conflicts:
	t/01_socket_timeout.t