Merge commit '51d0777e8' into thread-next

diff --cc filter/test.conf
Simple merge

diff --cc lib/birdlib.h
Simple merge

diff --cc sysdep/unix/log.c
Simple merge