Merge from gnulib and try to repair bad merge