Merge 4.2 Into Master

This shows up as a load of commits because of the way the subsplit was working.

You can see the real changes in the "files changed" section.