Sync with maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 29 Jul 2019 19:40:42 +0000 (12:40 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 29 Jul 2019 19:40:42 +0000 (12:40 -0700)
* maint:
Merge fixes made on the 'master' front

Trivial merge