Pull in a whole load of changes from the trunk.