Merge remote-tracking branch 'sarava/bug/3003'

Conflicts:
	handlers/rsync.in

diff --cc handlers/rsync.in
index 13399c91cf14761f479ff237ab0ff4ac1a4507c4,81bd5b42f8070c17b3752ea36c5f5b1c7a8dcb55..d0c211ccb27f560b0459c678c804506cca288d46
--- 1/handlers/rsync.in
--- 2/handlers/rsync.in
+++ b/handlers/rsync.in
@@@ -275,15 -277,13 +275,19 @@@ function eval_config 
      mv=move_files
    fi
  
 -  for path in $exclude; do
 -    excludes="$excludes --exclude=$path"
 +  set -o noglob
 +  SAVEIFS=$IFS
 +  IFS=$(echo -en "\n\b")
 +  for i in $exclude; do
 +     str="${i//__star__/*}"
 +     excludes="${excludes} --exclude='$str'"
    done
 +  IFS=$SAVEIFS
 +  set +o noglob
+ 
+   # Make sure we'll run bash at the destination
+   ssh_cmd="$ssh_cmd /bin/bash"
+ 
  }
  
  function rotate_short {