Uncommitted audio metadata
Merge branch 'master' into leonard