=== modified file 'ssh-slave'
--- ssh-slave	2013-06-18 14:17:59 +0000
+++ ssh-slave	2013-06-12 20:24:15 +0000
@@ -35,10 +35,6 @@
 	s=$svdir/$svname
 	mkdir -p $s
 	print -r - 'args=(' ${(q)@} ')' >$s/args
-	if [[ -n $DISPLAY ]]; then
-		print -r export DISPLAY=${(q)DISPLAY}
-		print -r export SSH_ASKPASS=/usr/bin/x11-ssh-askpass
-	fi >> $s/args
 	touch $s/down
 	[[ -a $s/run ]] && rm $s/run
 	ln -s ${commands[sv.ssh-master.run]} $s/run

=== modified file 'sv.ssh-master.run'
--- sv.ssh-master.run	2013-06-18 14:17:59 +0000
+++ sv.ssh-master.run	2013-06-04 08:34:15 +0000
@@ -16,4 +16,4 @@
 	command ssh -O exit "$args[@]"
 fi
 
-exec ssh -y -n -o LogLevel=VERBOSE -o ControlMaster=yes -N "${args[@]}"
+exec ssh -y -o LogLevel=VERBOSE -o ControlMaster=yes -o BatchMode=yes -N "${args[@]}"