Sync with maint

* maint: fixes from 'master' for 2.13.4

Junio C Hamano committed Jul 21, 2017 at 15:13 UTC 5eada8987e79f216f2002a3cd991360a50cd577c

No changes.