d57610d Merge branch 'master' into f23

Merged and Committed by sdgathman 7 years ago
    Merge branch 'master' into f23
    
        
file modified
+7 -4
file modified
+3 -4
file modified
+4 -1