mpg123 -> mplayer
Merge remote-tracking branch 'upstream/master'