Refactor out apnic whois variant maps
Refactor out apnic whois variant maps
Merge remote-tracking branch 'origin/master'