------------------------
Merge fork `sphinxcontrib_django2 <https://pypi.org/project/sphinxcontrib-django2/>`_ back into `sphinxcontrib_django <https://pypi.org/project/sphinxcontrib-django/>`_.
*Versions 0.6 until 1.6 were releases of the fork. With version 2.0, the changes are included in the original package again.*