Included in 2.6.8-rc1