307ced Merge with F28 branch, fix FTBFS

Authored and Committed by jwrdegoede a year ago
    Merge with F28 branch, fix FTBFS
    
    -Sync in changes which were only added to the F28 branch
    -Add a patch from upstream git to fix FTBFS
    
        
file modified
+6 -2