V4

Ok you are good to go. I verified this will indeed merge with master (or any branch of master in its current state). This will most likely not merge with v4 in its current state - that wasn't my goal, as this branch came from master on your repo, not v4. But if you rename v4 to something else and make a new v4 branch based on master, this should merge smoothly with no conflicts.

It took some time to work out what the issues were - I kept getting all of the pull requests that weren't merged yet and your V4 branch when updating master, which naturally was a nightmare to merge!

This branch has been fully rebased to the current state of master, however if you make more changes to master after today, rebasing will be required again before it can be merged.