Robert, José,
I've rebased this on top of master and added a few additional checks andregression tests.
I'm planning to continue going over the patch tomorrow morning withplans to push this before the feature freeze deadline.
Thanks!
Stephen