HomeFreeBSD

Merge ^/head r304848 through r304880.