Dev upstream merge

Updating semihalf/freebsd with Juniper/master.