I expect 2.1 to be a relatively conservative release, to collect up any missing minor features needed by users who haven't followed the 1.6.1->2.0 odyssey. Larger-scale rework (like anything blocked on the generator being broken) can probably wait until 2.2.