ac118ab :wqerge branch 'f27' into f26

Merged and Committed by jgrulich 6 years ago
    :wqerge branch 'f27' into f26
    
        
file modified
+1 -0
file modified
+6 -3
file modified
+1 -1