Sync with maint

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

Junio C Hamano committed Jul 25, 2019 at 14:34 UTC 3034dab9ed6b11970a53099a7b3ca981f1461365

No changes.