Merge pull request #321 from wolfmanjm/upstreamedge

extend gkbeers fix for cd to player.cpp
fix M26 and M23