Merge branch 'master' into dbus-work