A lot of things are being done in 2.x. Some of the changes can be merged in 1.x, like * a7972aa9ea0ba5a9f980f8de94ae475919a43bb2 We can do that once the dust has settled.