Commit 358286cc authored by Lukas Riedel's avatar Lukas Riedel

Merge branch 'revert-813ec064' into 'master'

Revert "Merge branch 'hotfix-sphinx-version' into 'master'"

See merge request !152
parents 71ff280d a1b1a136