Updated for the 1.1 pre-release.