Merge in a bunch of updates from the arribasim master