Merge in changes from redland-testing