72c10ec Merge branch 'master' into f26

Merged and Committed by rdieter 6 years ago
    Merge branch 'master' into f26
    
        
file modified
+2 -0
file modified
+10 -1
file modified
+1 -1