; Merge from Gnulib (comment changes only)