Merge branch 'my-dbus-1.2'