Merge branch 'jn/gitweb-pickaxe'