Merge branch 'master' into next

* master:
checkout: use --aggressive when running a 3-way merge (-m).
revert/cherry-pick: use aggressive merge.
read-cache.c: use xcalloc() not calloc()
apply: fix infinite loop with multiple patches with --index

diff --cc apply.c
Simple merge

diff --cc read-cache.c
Simple merge