HomeFreeBSD

Merge ^/head r364251 through r364263.