Sync us up with FreeBSD's releng/9.2, keeping our important changes