Lifted to new play 2.2.1 version