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