Merge branch 'master' into mq-filter-stack

diff --cc nest/route.h
Simple merge

diff --cc nest/rt-attr.c
Simple merge

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

diff --cc proto/ospf/ospf.h
Simple merge

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

diff --cc test/birdtest.c
Simple merge