docs: Unbreak docs building

(cherry picked from commit 7b667028e140ee56f6a365c8135f812eaaaaa284)
Merge branch 'master' into develop