Merge branch 'hu' into docs-mw
Hu evidently wrote his two patches in separate branches, with the effectthat they conflict with each other. I've applied them in the same way tolet "git merge" sort it out.
Jonathan Corbet 2 years ago 5e2045ee 44a54e25