Merge remote-tracking branch 'mplayer/master'