This didn't get to the 0.9.8-dev thread...