Sync with maint
commit5eada8987e79f216f2002a3cd991360a50cd577c
authorJunio C Hamano <gitster@pobox.com>
Fri, 21 Jul 2017 22:13:25 +0000 (21 15:13 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 21 Jul 2017 22:13:25 +0000 (21 15:13 -0700)
treede78540d885e7c790831b3003b9ea45f25fb3352
parent19533e2c713f240d1f6616bb2db18bf653c10106
parent2187e112d719109cac64d39e1bd8a04b123b6eed
Sync with maint

* maint:
  fixes from 'master' for 2.13.4