Merge branch 'dbus-1.10'