Upgraded to Lift 2.5-RC6