Pre-merge commit
Merge branch 'EIGRP-Development' of https://github.com/janovic/Quagga-EIGRP.git into EIGRP-Development