updated for play 2.1-RC3