Merge "Switch to current FreeBSD qsort."