Include music in installation
Merge r5231 HEAD