Bump version for hotfix branch
Fix code for killing deliver task

There really should be a better way, but that will require significant
changes to io.c so that we can interrupt a task doing a read.  This
should work, and will complain in the log when it isn't working.
Merge branch 'hotfix/1.8.1' into develop

Conflicts:
	src/connection.c
	src/connection.h
Messed up slightly merging in 1.8.1 hotfix

That's what I get for not running tests after merge; bad Jason.