All necessary changes are already in 3.13-rc7.