Add note on IPv6
Merge with master