Resume timeout handlers between requests #231
Merge branch 'fix-231'

Conflicts:
	warp/warp.cabal