Sync with v2.12.3

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

Junio C Hamano committed May 8, 2017 at 20:20 UTC 09fc7aff1a3ebc20473993e558eba691180706ad

No changes.