Merge remote-tracking branch 'upstream/master'

Conflicts:
	awlsim/coreserver/messages.py
Merge branch 'master' into hw_tcp