Merge commit 'ab827cb15' into thread-next

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

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

diff --cc proto/bgp/bgp.c
Simple merge