Merge branch 'quagga'