Release prep.
Merge branch 'versions/0.5' into dev

Conflicts:
	CHANGES.txt