Merge pull request #2906 from arnova/music_db_fixes