I've basically given up trying to track everything in both branches.

So here is just all the latest fixes on top of what was already there.

    Ian