Let's target this with the 2.0.x development release.