Merge branch 'rs/unpack-trees-leakfix' into maint

By René Scharfe * rs/unpack-trees-leakfix: unpack-trees: plug minor memory leak unpack-trees: don't perform any index operation if we're not merging