Merge remote-tracking branch 'freebsd/master' into hardened/current/master
Merge branch 'hardened/current/master' into hardened/current/unstable