Note that this commit (and its ^2) were performed manually, not
by gbp import-orig, in order to have both the upstream and
upstream-experimental branches be parents and properly capture
changes occurring on both (debian) master development and upstream
(experimental) development.