cherry-pick ae32b25a3d4d88e890b18a10dfa6173d2440041a

Merge https://github.com/opensourcerouting/quagga/commit/1b8b2471c8c45aefcaf83aaeda8ee00869b72ddf.patch

Conflicts:

	debian/changelog
0.99.20.1-13+daisy5