I'm working on some builder fixes to handle various promotion cases correctly. I have a clean build out of my local copy with the changes, and I'd like to get them in to the next 1.3 RC if possible. I should be ready to check them in later today.
Simon
