Sync with 2.13.2

Signed-off-by: Junio C Hamano <gitster@pobox.com>

Junio C Hamano committed Jun 24, 2017 at 15:34 UTC e629a7d28a405e48fae6b064a781a10e885159fc

No changes.