Merge branch 'master' into topology-editor

Conflicts:
	examples/hardware.json
	examples/model.json