Merge from vendor branch PKGSRC: