IPv6 support
Merge branch 'master' of github.com:plonk/yap