Merge pull request #4340 from hnyman/vsftpd