Update daemon
Merge branch 'master' into deb-supervisor-conf-2