GH-44

Backport changes from Play! master branch