Merge branches 'jc/daemon' and 'mw/http'