Upgrade to Play 2.1-RC2