Conflicts: docs/managers.rst polymorphic/admin.py polymorphic/manager.py polymorphic/tests.py runtests.py