161925 Merge branch 'master' into epel7

Merged and Committed by sdgathman 2 years ago
    Merge branch 'master' into epel7
    
        
file modified
+10 -6
file added
+182
file modified
+51 -16