Whoops, that was supposed to go in the 2.0 branch.