Merge remote-tracking branch 'upstream/bookwyrm-entities' into develop