Merge branch 'dev'

Conflicts:
	core/packets.h
	core/ping.c
core: Move ping request/response into ping.c