Rebased to 1.1-SNAPSHOT.