HomeFreeBSD

Merge ^/head r320971 through r320993.