Auto-Merge pull request #2949 from rubenk/fix-detection-of-xmms