fcd6b86 Merge branch 'master' into epel7

Merged and Committed by Nick Bebout 6 years ago
    Merge branch 'master' into epel7