Port to play 2.3.0 final, scala 2.11.1