Upgrade to play 2.2.1
Merge remote-tracking branch 'remotes/origin/master' into gui