b8ac463 Merge branch 'f26' into f24

Merged and Committed by Rex Dieter 7 years ago
    Merge branch 'f26' into f24
    
        
file modified
+1 -9
file modified
+5 -2
file modified
+1 -1