Merge "Another try at fixing the docs build."