Sync with gnulib 06b335ade65c8fe60fee8b9e18b670bb54ed924a: