Merge branch 'dbus-1.2'