Merge 3.4 (Issue #25461)

diff --cc Doc/library/os.rst
Simple merge

diff --cc Misc/ACKS
Simple merge