handle ipv6 properly, and why not, log stuff better
Merge branch 'v6-round-two' into develop
Merge branch 'develop' into release-v0.3.0
Update ChangeLog
Merge branch 'release-v0.3.0'