Merge remote-tracking branch 'waldi/managed-rsyncd-ftp-master'