Merge pull request #10469 from peter-stadler/django-etesync-journal