Sync with 2.11.4

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

Junio C Hamano committed Sep 22, 2017 at 14:45 UTC 65c9d4bd7bcb3f087b56b659423c82a034ecacbd

No changes.