Ready for 2.0-dev