Merge branch 'jc/http'