Merge remote-tracking branch 'origin/h3' into h6
Merge remote-tracking branch 'origin/h9' into h6

Conflicts:
	world
Merge remote-tracking branch 'origin/h9' into h6
Merge remote-tracking branch 'origin/h6' into h9