Import more changesets from Rob Landley's fork (part 2)