minimal change-set to support play 2.2-RC1 compatibility