Fixes https://pagure.io/pagure/issue/2683
rebased onto a80f8c6994b02483c0aa4186cb230d3d8b86365f
:thumbsup:
rebased onto 8821f714086e51297b93a8a9c3482b13ea39e8f5
Pull-Request has been merged by pingou
Fixes https://pagure.io/pagure/issue/2683