Merge r1.2 from NetBSD: