Merge commit 'origin/master' into debian-master

diff --combined lib/Packages/Dispatcher.pm
index 3c0694ab14f40e498ebf9f113fd803b19d81bb18,4c3c31fc8beabf44c9c055a2be5eec9502968475..9639e92deff877d4f344385e1d1b81a4ee295977
--- 1/lib/Packages/Dispatcher.pm
--- 2/lib/Packages/Dispatcher.pm
+++ b/lib/Packages/Dispatcher.pm
@@@ -138,7 -138,7 +138,7 @@@ sub do_dispatch 
  
      my $what_to_do = 'show';
      my $source = 0;
 -    if (my $path = $input->path_info() || $input->param('PATH_INFO')) {
 +    if (my $path = $ENV{'PATH_INFO'} || $input->param('PATH_INFO')) {
        my @components = grep { $_ } map { lc $_ } split /\/+/, $path;
  
        debug( "PATH_INFO=$path components=@components", 3) if DEBUG;
@@@ -271,7 -271,7 +271,7 @@@
                                 array => ',', var => \@archs, replace =>
                                 { any => \@ARCHITECTURES } },
                       format => { default => 'html', match => '^([\w.]+)$',  },
-                  mode => { default => undef, match => '^(\w+)$',  },
+                  mode => { default => '', match => '^(\w+)$',  },
                   sort_by => { default => 'file', match => '^(\w+)$', },
                   );
      my %opts;