Updating history for 0.5.4 release.
Merge branch 'master' into development

Conflicts:
	HISTORY.md
	setup_description.rst