Merge pull request #3762 from akoeplinger/fix-ftp-ipv6