Doc updates
Merge branch 'refs/heads/ipv6' into v0.3