I have almost completed merging changes back from M2 to trunk. Just wanted to give everyone a heads up for a big commit. Unless you are editing the broker or 0-8 client there shouldn't be many changes to worry about.
I hope to do the commit later today. Regards -- Martin Ritchie
