Merge remote-tracking branch 'quagga-gnu.org/master'