Merge branch 'ftp_port_missing'
Merge branch 'osx_filename_problem'