Merge branch 'master' into manager

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

diff --cc distro/pkg/deb/control
index 6aaaa074d13fcedf66e197851c6c54667a0614b6,fdf213cc521360752c122625dbb221143c0437c6..299a350b22a1b6df7e39ac61ba8c46d75b4e279d
--- 1/distro/pkg/deb/control
--- 2/distro/pkg/deb/control
+++ b/distro/pkg/deb/control
@@@ -2,11 -2,8 +2,9 @@@ Source: knot-resolve
  Section: net
  Priority: optional
  Maintainer: Knot Resolver <knot-resolver@labs.nic.cz>
- Uploaders:
-  Tomas Krizek <tomas.krizek@nic.cz>
  Build-Depends:
   debhelper (>= 9~),
 + dh-python,
   libcmocka-dev (>= 1.0.0),
   libedit-dev,
   libfstrm-dev,

diff --cc doc/build.rst
Simple merge