Made compliant with Play 2.1 release