Fixed possible bug.
tabs -> spaces
Merge remote-tracking branch 'upstream/master' into pr
handle_ping_response function signature correction
Merge branch 'pr'

Conflicts:
	core/Messenger.c
	core/network.c