should really give a proper message here
Merge branch 'tidy_http'