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

Conflicts:
	src/node/catchup.ml