bafb86f5bc
Merge this back as we've built up a fair few conflicts, and I have some newer trees to pull in.
Merge this back as we've built up a fair few conflicts, and I have some newer trees to pull in.