upstream merge
pull in changes from upstream (fix imports)
implement missing methods for interface
Fix exception
Delete unused files
Fix bug where reloading these modules made it impossible to catch HTTPErrors
Fix circular import and other import issues. Don't print stuff.