Sync with gnulib 47f4ca8fe9506254200028c8a8c5fffbf1bf1161