Updated for Play 2.1-RC3