Merge branch 'master' into add-path

diff --cc filter/filter.c
Simple merge

diff --cc nest/proto.c
Simple merge

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

diff --cc proto/bgp/config.Y
Simple merge

diff --cc sysdep/bsd/krt-sock.c
Simple merge

diff --cc sysdep/linux/netlink.c
Simple merge

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