Merge branch 'develop' into feat-autopacketgraph

Conflicts:
	src/autowiring/AutoPacket.cpp