Some debug stuff
Merge branch 'master' into fix-pcap

Conflicts:
	include/ec_globals.h
	include/ec_network.h