Fixed python and python-docs build
Merged