Updated to Lift 2.6-RC2