Upgrade to play 2.3.6