Sync with maint

* maint: Merge fixes made on the 'master' front

Junio C Hamano committed Jul 29, 2019 at 12:40 UTC 8b79343fc06ec8258499cbaca40fe1b04c209cd1

No changes.