Backport 2.0.0 to 1.16.1

This commit is contained in:
Motschen
2020-09-20 12:45:23 +02:00
parent 4764147e1c
commit 9b5a356ed1
15 changed files with 92 additions and 117 deletions