Merge remote-tracking branch 'origin/dbus-1.4'