Merge branch 'daemon-tamer'