Pull in updates from v0.10