Merge branch 'qdisc-hash-fixes'