Upgrade to play 2.1-RC2