Initial port version
Fix the #ifdef for IPv6 address notification
Merge branch 'updates'