Sync with gnulib 844f63f9576ebb74fde62e5017bf838c69db22c4.