Upgrade to play 2.3.4, scala 2.11.2