Update from 2.5.0.5 to 3.1.1.2