Play 2.1.0 upgrade