master
Fix sdist _version.txt inclusion by deferring git add until source_tarball
Merge branch '3008.x' into merge/3008.x/master-26-06-24
Merge remote-tracking branch 'origin/3006.x' into merge/3006.x/3007.x/25-06-08