Fix some tabs, spaces etc.
Fix merged file
ftp: change deafult upload file permission to 0666
Merge remote-tracking branch 'upstream-obsy/master'