Merge remote-tracking branch 'stevee/avahi-fixes' into next