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

Conflicts:
	src/node/node_main.ml