9d1900a Merge branch 'f26'

Merged and Committed by jgrulich 6 years ago
    Merge branch 'f26'
    
        
file modified
+1 -0
file modified
+14 -2
file modified
+1 -1