Merge

mysync

     if localpath is not None:
         remotepath = path_filter(kwargs.get(PROP_REMOTE))
         skip = kwargs.get(PROP_SKIP)
-        cmd_l = ['rsync', '-avn' if DEBUG else '-av', '--delete', '--rsync-path="%s"' % RSYNC_REMOTE_COMMAND, remotepath, localpath]
+        if remotepath.find('@') != -1:
+            cmd_l = ['rsync', '-avn' if DEBUG else '-av', '--delete', remotepath, localpath]
+        else:
+            cmd_l = ['rsync', '-avn' if DEBUG else '-av', '--delete', '--rsync-path="%s"' % RSYNC_REMOTE_COMMAND, remotepath, localpath]
         if skip is not None:
             for skip_dir in skip:
                 if not skip_dir.endswith('/'):