Merge  from avplayer:master