Sync with gnulib 0a6dafee2bb8f69a931345a1f67d835ee5062967