test git-ftp
Merge branch 'hotfix/gitftp'