Upgrade to play 2.1