Merge branch 'jn/gitweb-fastcgi' into next