Merge branches 'upstream' and 'upstream-rpslvariant' of github.com:APNIC-net/whois into upstream-rpslvariant
Merge branch 'upstream-rpslvariant' of github.com:APNIC-net/whois into upstream-rpslvariant
Updated to make tests pass