d2370fb Merge branch 'master' into f27

Merged and Committed by jorton 6 years ago
    Merge branch 'master' into f27
    
        
file modified
+23 -133