Merge branch 'stable-3.x'

diff --combined yarrg/commod-update-receiver
index f11442854c0f31bf4029600ac5a9b705fae0db3a,3ae1a6208a0fb01eaceaf3c3eeb291842b34ebe1..4ae267d9b41d3ce78e217b3d74164a0c6feda09a
--- 1/yarrg/commod-update-receiver
--- 2/yarrg/commod-update-receiver
+++ b/yarrg/commod-update-receiver
@@@ -35,7 -35,7 +35,7 @@@ $CGI::POST_MAX= 3*1024*1024
  
  use CGI qw/:standard -private_tempfiles/;
  
 -setlocale(LC_CTYPE, "en_GB.UTF-8");
 +set_ctype_utf8();
  
  our $now= time;  defined $now or die $!;
  
@@@ -133,9 -133,10 +133,10 @@@ foreach my $mid (<_mid-*.hold>) 
      unlink $mid or $!==&ENOENT or die "$mid $!";
  }
  
+ $o{'instance'}= $ENV{'YARRG_INSTANCE'};
  
  my $mcontent= MIME::Entity->build(To => 'yarrg-commod-updates',
-                                 Subject => $pwd,
+                                 Subject => $ENV{'YARRG_INSTANCE'},
                                  Type => 'multipart/mixed',
                                  Boundary => '=',
                                  'Message-ID' => $mid,