f643203
Import patches from GitHub Note that `fedpkg prep` gives exactly the same tree before and after this change.