Merge pull request #3484 from vlakoff/documentation

[ci skip] Fix Sphinx compilation errors