Related: https://pagure.io/fedora-websites/issue/1175
rebased onto 2362d272545ae873b7c2d0f23901b4735bb8dac8
Pull-Request has been merged by darknao
Related: https://pagure.io/fedora-websites/issue/1175