Merge branch 'milestone1.6' of ssh://git@github.com/tuxmonteiro/vxrouter.git into milestone1.6
Merge branch 'milestone1.6' of ssh://github.com/tuxmonteiro/vxrouter into milestone1.6