116eae6 Merge branch 'master' into epel7

Merged and Committed by onosek 4 years ago
    Merge branch 'master' into epel7