Fixes: https://pagure.io/koji/issue/671
rebased onto 6844238dca106406ea287b0852b0e2802a4010ef
rebased onto dc90613eba6ee0769d1993db4952a591ec971c9d
:thumbsup:
Commit ec791b12 fixes this pull-request
Pull-Request has been merged by mikem
Fixes: https://pagure.io/koji/issue/671