HomeFreeBSD

Merge ^/head r363583 through r364040.