f3797e2 Merge branch 'master' into f26

Merged and Committed by jorton 6 years ago
    Merge branch 'master' into f26
    
        
file modified
+2 -2
file modified
+2 -1
file modified
+44 -15
file modified
+2 -1
file modified
+6 -5