Work around bug in glibc 2.11
Merge pull request #1782 from mietek/master

Work around bug in glibc 2.11