updated for Play Framework 2.1.2