Sync with master
authorJunio C Hamano <gitster@pobox.com>
Fri, 17 Mar 2017 20:54:26 +0000 (13:54 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 17 Mar 2017 20:54:26 +0000 (13:54 -0700)
commitad415229794d1880faab8b9fdd535ab7cc736444
tree6ef396a82a93470bee04e18d67fa869b947e64c0
parent788a931e393c349e7bad68f403bc4619e9c0f48c
parent9d77b0405ce6b471cb5ce3a904368fc25e55643d
Sync with master

* master:
  Fifth batch for 2.13