Merge branch 'master' into persona-flag

Conflicts:
	specifications/conceptual-model-specification.md
Merge branch 'persona-flag'