Sync with gnulib 62bb7a8bf95807d6339e1e17fc0d21c319b280a2.