Lots of files changed but the commit can be reviewed one by one :)
rebased onto af363597aed2852dd32f5f5c2e186f24d2193e92
pretty please pagure-ci rebuild
Pull-Request has been merged by bcotton