47ac2b1 Merge branch 'master' into f27

Merged and Committed by sdgathman 6 years ago
    Merge branch 'master' into f27
    
        
file modified
+6 -4
file modified
+15 -5