Merge remote-tracking branch 'remotes/quagga/master'