Prépare merge with 1.5-dev3