merge from glibc