Merge commit '913ec57f' into thread-next-iface

diff --cc doc/bird.sgml
Simple merge

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

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

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

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