Prepped for 0.9.0-rc2