Merge remote-tracking branch 'origin/dev-python/pytest-django'