correzioni
Merge branch '2.4' into 2.5