Merge branch 'dbus-1.4', omitting the DBUS_INLINE stuff