Upgrade to Play 2.1.1 / Scala 10