0.48 plus another commit tracking down OpenBSD failure