Fixes #3355: Update to Lift 2.5-rc2