Merge from gnulib.