Just pre-CUP-publication version
	--------------------------------

Includes all the changes that are in the CUP published version,
but still as two separate reports.  Next thing to do is to merge them.