merges Sphinx doc build fixes from Alex