Merge remote-tracking branch 'upstream/pf-3.17' into pf-3.17
Merge branch 'pf-3.17' of https://github.com/mcdope/pf-kernel into pf-3.17