Merge branch 'glibc-update' into thirteen