The default player is now a Trial Player
Merge remote-tracking branch 'origin/master'