Merge remote-tracking branch 'remotes/origin/master' into spinnman_register_listener_branch

Conflicts:
	spinnman/_threads/_scp_message_interface.py
	spinnman/transceiver.py