Merge branch 'bsdlibc'