080d6be Merge branch 'master' into epel7

Merged and Committed by germano 7 years ago
    Merge branch 'master' into epel7