From diff to 2.6.6+ Officiel