Merge branch 'master' into linear_allocation

Conflicts:
	sdd/dd/definition.hh