Merge pull request #403 from hnyman/fix-qos-l7