Merge Ahead

I have just merged our main line code to my incredibly long-lived branch with far too many changes in it.

If it will just pass one more test, we can then merge my incredibly long-lived branch back to the main line.

Keep your fingers crossed!