Re #10159. Hopefully fixing the sphinx builds.
Merge branch 'bugfix/10159_python_whitespace' into develop