changes to support play 2.2.0-RC1