Sync with v2.13.1
authorJunio C Hamano <gitster@pobox.com>
Mon, 5 Jun 2017 00:33:16 +0000 (09:33 +0900)
committerJunio C Hamano <gitster@pobox.com>
Mon, 5 Jun 2017 00:33:16 +0000 (09:33 +0900)
Trivial merge