HomeFreeBSD

Merge ^/head r336870 through r337618.