Merge pull request #1 from genehack/master

Return 404 via handle_response too
release engineering 0.06
changelog
Merge remote-tracking branch 'upstream/master' into handle_exception

Conflicts:
	Changes