Bug fix + changes related to Play 2.3.3 migration