Dev upstream merge

Updating Semihalf/freebsd with Juniper/master.