Upgraded for Play 2.1-RC2