Incorporate better branch (music) into inferior branch (master)

Obviously.