Merge branches 'maint' and 'jc/http'