Merge git://anongit.freedesktop.org/git/dbus/dbus-c++ into freedesktop