Update to 2.0 rc 1