Merge remote-tracking branch 'upstream/develop' into namecoin

Conflicts:
	node/transport.py