44ad7a6 Merge branch 'master' into f27

Merged and Committed by rdieter 6 years ago
    Merge branch 'master' into f27
    
        
file modified
+9 -5
file modified
+15 -18