As it stands, it will go in 4.2. But it's proabably ok to merge into 4.0 if the other issues are addressed quickly.