Reflect changes to Sandstone.

Go read Sandstone's changelog if you want to know all the differences.