Merge pull request #4896 from sportica/mac_fix_space

Some character disappear on mac os x
Merge pull request #5039 from CEikermann/patch-1

Trac #15178: FTP TLS not working