Merge into amcat

Creating the pull request so we can add comments (but maybe we want to split the changes into smaller requests, if there are modular subsets of commits)