This is now 2.6.0