Merge branch 'dbus-1.4' rejecting commit 4ebb275ab7b6f71d5