Update for Play 2.1.1.
And a small bugfix, I don't know how that got in there.