Migrated to Play 2.1-RC3