Merge remote-tracking branch 'origin/1.0.0pre19.x'
[tripe] / .mailmap
1 Mark Wooding <mdw@distorted.org.uk> <mdw>