Righto, I've started preparing feature-branch for merging into trunk, so in the interests of retaining my sanity i ask that no one commit anything to it. --Oliver