Add # to issue numbers in CHANGELOG so they (I think) will have automatic links from the wiki page
Fix wrapping of issue numbers
Merge branch 'master' into #299

Conflicts:
	CHANGELOG.md
	HISTORY.md