Initial roll forward from Informatik 2012+Additions
Upstream changes from Play 2.0 to Play 2.1