Merge tag 'v2.13.5' into maint

Junio C Hamano committed Aug 4, 2017 at 12:40 UTC 230ce07d134f597a8107d3ed5d76d212ff90db70

No changes.