I think Simon will ask you to rebase this on the 4.0 branch, since he just fixed this.