8b71585 Merge remote-tracking branch 'origin/f26' into f25

Merged and Committed by kkeithle 6 years ago
    Merge remote-tracking branch 'origin/f26' into f25
    
        
file modified
+10 -7