Merge origin/master

Conflicts:
	MOSES_FC/control.c
	MOSES_FC/packet.c