Merged with Stefan
Merge branch 'develop' of https://github.com/Deutsche-Digitale-Bibliothek/ddb-next.git into develop