I flattened those commits together and committed to trunk. I'm still trying to get my build environment working again on my new computer. Can you make sure it compiles, please? -- Richard