Merge pull request #616 from neheb/quagga