Merge with previous upstream.

Their message:
	This is 7.3.0

Needed to fix up the old commit to better match the upstream.

Fixed version data and naming.