Merge branch 'jn/gitweb-plackup' into next