Merge branch 'origin/master' into thread-next

diff --cc .gitlab-ci.yml
Simple merge

diff --cc configure.ac
Simple merge

diff --cc distro/pkg/deb/changelog
Simple merge

diff --cc distro/pkg/deb/control
index 6b08813b43747b04fc04f783aa2245d61b3c6057,57e3e3a74f95d75eb4756da84228d1632884173d..095ec5f8822d01934d4eda91fb0298417ef72c25
--- 1/distro/pkg/deb/control
--- 2/distro/pkg/deb/control
+++ b/distro/pkg/deb/control
@@@ -17,10 -17,10 +17,10 @@@ Build-Depends-Indep
   linuxdoc-tools-latex,
   opensp,
   texlive-latex-extra,
- Maintainer: Jakub Ružička <jakub.ruzicka@nic.cz>
+ Maintainer: Maria Matejka <maria.matejka@nic.cz>
  Standards-Version: 4.7.0
 -Vcs-Browser: https://salsa.debian.org/debian/bird2
 -Vcs-Git: https://salsa.debian.org/debian/bird2.git
 +Vcs-Browser: https://salsa.debian.org/debian/bird3
 +Vcs-Git: https://salsa.debian.org/debian/bird3.git
  Homepage: https://bird.nic.cz/
  Rules-Requires-Root: no
  

diff --cc doc/bird.sgml
Simple merge

diff --cc misc/gitlab/data.yml.j2
Simple merge

diff --cc misc/gitlab/template.yml.j2
Simple merge