Supersedes #39605. Fixes #39585. (cherry picked from commit eedb729771)
eedb729771
--lang
make_rst.py