Fix automapping to ipv6

Bugfix on 0.2.4.7-alpha; fixes bug 10465.
Merge branch 'bug10465' into maint-0.2.4
Merge branch 'maint-0.2.4' into release-0.2.4
fold in next changes entry