b01fc4a Merge branch 'f26'

Merged and Committed by jgrulich 7 years ago
    Merge branch 'f26'
    
        
file modified
+3 -0
file modified
+17 -5
file modified
+1 -1