Merge branch 'master' into cgiencoding

diff --combined Debbugs/Control.pm
index c0c835bad98e0f4b85136f0647852fb2b4df4464,ed69c84bd4147a3824a4709713937d315ccf8a1c..631504a8d5420a24db292d736732201a3ad9113b
--- 1/Debbugs/Control.pm
--- 2/Debbugs/Control.pm
+++ b/Debbugs/Control.pm
@@@ -996,7 -996,7 +996,7 @@@ sub set_done 
                                                             headers =>
                                                             [To => $data->{submitter},
                                                              Subject => "$config{ubug}#$data->{bug_num} ".
 -                                                            "closed by $param{requester} ($param{request_subject})",
 +                                                            "closed by $param{requester} ".(defined $param{request_subject}?"($param{request_subject})":""),
                                                             ],
                                                            )
                                            ],
@@@ -2898,7 -2898,7 +2898,7 @@@ sub clone_bug 
      for my $bug (split ' ', $data->{blocks}) {
        for my $new_bug (@new_bugs) {
            set_blocks(bug => $new_bug,
-                      blocks => $bug,
+                      block => $bug,
                       hash_slice(%param,
                                  keys %common_options,
                                  keys %append_action_options),
@@@ -2909,7 -2909,7 +2909,7 @@@
      for my $bug (split ' ', $data->{blockedby}) {
        for my $new_bug (@new_bugs) {
            set_blocks(bug => $bug,
-                      blocks => $new_bug,
+                      block => $new_bug,
                       hash_slice(%param,
                                  keys %common_options,
                                  keys %append_action_options),