Merge pull request #7578 from joelucid/rpm_filter_bugfix