Merge from gnulib, incorporating: