Pull in latest changes

Oops, hang on a sec, the buildbot got a bit clogged and so the latest changes are still being imported.