music: issue 166
Merge branch 'music' into production