Merge branch 'stable-3.x'

diff --cc yarrg/Commods.pm
index 44cc74e8543b91b885ee76082cb3ea0042d5f3fd,b58471ce43a9370a74aa8a6ec8eb11f51822ff62..9c8281876f334b99578e73622cf95f00e9ec6259
--- 1/yarrg/Commods.pm
--- 2/yarrg/Commods.pm
+++ b/yarrg/Commods.pm
@@@ -204,8 -201,23 +201,8 @@@ sub fetch_with_rsync ($) 
      return $local;
  }
  
 -sub parse_info_maproutes ($$$) {
 -    my ($on, $allislands, $routemap) = @_;;
 -    foreach my $k (sort keys %$routemap) {
 -      my @ok= grep { index($_,$k) >= 0 } @$allislands;
 -      die "ambiguous $k" if @ok>1;
 -      if (!@ok) {
 -          $route_mysteries{$on}{$k}++;
 -          delete $routemap->{$k};
 -      } elsif ($ok[0] ne $k) {
 -          $routemap->{$ok[0]}= $routemap->{$k};
 -          delete $routemap->{$k};
 -      }
 -    }
 -}
 -
  sub parse_info_serverside () {
-     parse_info1('source-info.txt','s');
+     parse_info1('source-info.txt','s',0);
  }
  sub parse_info_serverside_ocean ($) {
      my ($oceanname) = @_;