Merge branch '1-12-code-coverage' into 'dbus-1.12'