Merge remote-tracking branch 'origin/develop' into fix-backwardscompat

Conflicts:
	autowiring/AutoPacket.h