Sync with the latest Gnulib code (6f2d632)