747853a Merge branch 'master' into epel7

Merged and Committed by eclipseo 3 years ago
    Merge branch 'master' into epel7