upstream/2.5.2
6470041c · Merge tag 'v2.5.2' into upstream ·