246fe0d Merge changes from F30 to see how it works in EL7

Authored and Committed by smooge 4 years ago
    Merge changes from F30 to see how it works in EL7
    
        
file modified
+4 -0
file modified
+73 -12
file modified
+1 -1