Upgrade to Play2.2, pick up changes from PlayGround