Merge 1.5.0.5 in from 'maint'
[git] / t / t5100 / patch0007