Ported to PlayFramework 2.3.7