diff --git a/packager/0install/parallel.xml b/packager/0install/parallel.xml
index 7505a362..123116a9 100644
--- a/packager/0install/parallel.xml
+++ b/packager/0install/parallel.xml
@@ -117,11 +117,15 @@ xargs or cat | sh.
+
+
+
+
diff --git a/src/parallel b/src/parallel
index 5aa301c4..13e952e9 100755
--- a/src/parallel
+++ b/src/parallel
@@ -2941,7 +2941,7 @@ sub sshcommand_of_sshlogin {
$Global::sshmaster{$pid}++;
} else {
::debug($master,"\n");
- `$master`;
+ `$master , B, B, and B can reproduce
most errors. If your example requires large files, see if you can make
them by something like B > B.
+=item *
+
+The output of your example. If your problem is not easily reproduced
+by others, the output might help them figure out the problem.
+
=back
If you suspect the error is dependent on your distribution, please see
@@ -3292,6 +3297,11 @@ http://sourceforge.net/projects/virtualboximage/files/
Specifying the name of your distribution is not enough as you may have
installed software that is not in the VirtualBox images.
+If you cannot reproduce the error on any of the VirtualBox images
+above, you should assume the debugging will be done through you. That
+will put more burden on you and it is extra important you give any
+information that help.
+
=head1 AUTHOR
diff --git a/testsuite/tests-to-run/parallel-local20.sh b/testsuite/tests-to-run/parallel-local20.sh
index f2fe6576..335f4cc9 100644
--- a/testsuite/tests-to-run/parallel-local20.sh
+++ b/testsuite/tests-to-run/parallel-local20.sh
@@ -30,5 +30,9 @@ EOF
chmod 755 '/tmp/she "'
seq 1 3 >/tmp/123
'/tmp/she "'
+
echo '### bug #36595: silent loss of input with --pipe and --sshlogin'
seq 10000 | xargs | parallel --pipe -S 10/localhost cat | wc
+
+echo 'bug #36707: --controlmaster eats jobs'
+seq 2 | parallel --controlmaster --sshlogin localhost echo OK{}