Merge branch 'modern-autofoo-32245' into dbus-1.4