Bug 924988: Improvements to Music2 DB Loading
Merge pull request #12761 from es92/music2-dbloading-improvements

Bug 924988: Improvements to Music2 DB Loading r=davidflanagan