Merge branch 'master' of sourceware.org:/git/glibc into fedora/master