Merge remote-tracking branch 'origin/master' into haugesund-to-2.0

diff --cc doc/bird.sgml
Simple merge

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

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

diff --cc proto/babel/packets.c
Simple merge

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

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

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