962dfa912d
See https://github.com/sphinx-doc/sphinx/issues/6440 for upstream details Change-Id: I39079ec3e81cde2b1d8d8ef53219826298c61286