Merge pull request #436 from jdufresne/sphinx-warnings

Fix Sphinx warnings