merge tag upstream/1.38

No match.