Sync with maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 6 Dec 2017 17:27:59 +0000 (09:27 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 6 Dec 2017 17:27:59 +0000 (09:27 -0800)
commit3b136a71d875174d7539bf98080b85eaf415ba73
treef5ade0521d9257959090aaa4d01424277eeeea47
parentef470364448b6d5de159c3a961c1b1e8283d1dbc
parent3013dff8662eae06457fe6e5348dfe2270810ab2
Sync with maint