Temporary bug fix
Merge branch 'master' of github.com:play-project/WebApp