Merge pull request #2567 from jaimeMF/sphinx-docs