Merge from gnulib (comment-only change).