Update to latest 2.5.x - Dec 20th