Issue 1196: Fix test/spec
Merge branch 'master' of https://github.com/marcuslinke/Play20