Lifted to PlayVersion 2.2.0