adapted for play 2.1.x
Merge remote-tracking branch 'origin/master'