Merge branch 'master' into ben-work-in-progress
Editorial edits to Introduction and front material
Editorial changes to section 3
Merge branch 'master' into ben-work-in-progress

Conflicts:
	draft-donovan-doic-endpoints-00.xml
Merge branch 'ben-work-in-progress'