Upgrade to Play 2.1.3
Preserve Play 2.0 branch