Merge "Updated Sphinx version to 2.3.0"