Merge changes from gnulib.