Manually merge over changes from trunk, so that tests pass, as svnmerge appears to have missed something