HomeFreeBSD

Merge ^/head r309804 through r309816.