Merge remote-tracking branch 'upstream/master' into ipv6-scan

Conflicts:
	src/ec_send.c

Resolved conflicts in ec_send.c