bfa7928 Merge branch 'master' into epel7

Merged and Committed by sdgathman 5 years ago
    Merge branch 'master' into epel7
    
        
file modified
+2 -0
file modified
+16 -5
file added
+20