Merge branch 'mk/upload-pack-off-by-one-dead-code-removal'