Merge branch 'master' into dev
* FTP upload no longer deletes backup files, can be configured via maxBackupCount and persistentEnabled
* minor modification to info messages
Merge branch 'dev'