Merge remote-tracking branch 'origin/1.7' into 1.7-for-1.8b

Conflicts:
	src/node/mem_store.ml
	src/node/store.ml