Merge branch 'incubaid-1.6' into 1.6-for-1.7

Conflicts:
	src/paxos/master.ml
	src/paxos/slave.ml