Includes changes from this PR: https://pagure.io/fedora-comps/pull-request/632
rebased onto fb9e76052587c8f19cad7269ec76cec4c9872dbf
Previously mentioned PR has been merged.
Thanks! Looks good to me.
Pull-Request has been merged by kalev