Conversion to play 2.3
Down to deprecation only