Merge branch 'jn/gitweb-return-or-exit-cleanup'