Update internal player to be in sync with master branch