Merge branch 'master' into reconnect

Conflicts:
	tests.py
fix content-type
fix open pidfile error
fix test utils, add correct status_code changing for response, add remote_port to meta. Bump version.