Merge branch 'dbus-1.4'