Merge branch 'stable-5.x' into web

diff --cc yarrg/commod-update-receiver
index 123ca0cd7acc0c3778555ff786aa843881232dd0,0ae5ba8a8560a025b452c596ec9bad9be9458c06..2059ad792416710584c279eb1d2de63032220339
--- 1/yarrg/commod-update-receiver
--- 2/yarrg/commod-update-receiver
+++ b/yarrg/commod-update-receiver
@@@ -126,10 -126,10 +126,10 @@@ foreach my $islands (values %$arches) 
      die if $island_found;
      $island_found= $sources;
  }
 -fail("unknown island") unless $island_found;
 +fail("unknown island ".errsan($o{'island'})) unless $island_found;
  
  $o{'timestamp'}= must_param('timestamp', "^([1-9]\\d{1,20})\$");
- fail("clock skew") if $o{'timestamp'} >= $now;
+ fail("clock skew") if $o{'timestamp'} > $now;
  
  my $indatafh= upload('data');
  defined $indatafh or fail("data is not a file");