Merged update from upstream sources
    
    This is an automated DistroBaker update from upstream sources.
    If you do not know what this is about or would like to opt out,
    contact the OSCI team.
    
    Source: https://src.fedoraproject.org/rpms/rpm.git#7bcd4c2489663481cf6d68a583b2d8d30ccf0e75