Upgrade to support Play 2.3.1