Merge branch 'jk/upload-pack-keepalive'