Sync with FreeBSD-STABLE 10