Merge branch 'dbus-1.6'