Got rid of __DISABLE_IPV6_PROTO macro
Merge branch 'avian-droid' of https://github.com/bigfatbrowncat/avian into avian-droid