Sync with 2.13.6

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

Junio C Hamano committed Sep 22, 2017 at 14:50 UTC cef9271e0181fa22d337dca3a17bf07aa92a03e8

No changes.