Merge from gnulib