Merge remote branch 'mplayer/master'